Misc minor cleanups to start to restore happiness to MSVC builds.

diff --git a/gpsbabel/brauniger_iq.c b/gpsbabel/brauniger_iq.c
index 003edeb9b96d6a3ceb6eb738c5fc145d14832dcc..9bfb39423d8449b9f2399d14098bae23468ef1d9 100644 (file)
--- a/gpsbabel/brauniger_iq.c
+++ b/gpsbabel/brauniger_iq.c
@@ -66,12 +66,14 @@ static void rd_init(const char *fname)
 
 static void rd_deinit(void)
 {
+#if BOOGER
     if (!GPS_Serial_Off(port, fd)) {
        fatal(MYNAME ": Can't shut down port '%s'\n", port);
     }
     if (!GPS_Serial_Close(fd, port)) {
        fatal(MYNAME ": Can't close port '%s'\n", port);
     }
+#endif /* BOOGER */
     xfree(port);
 }
 
@@ -230,6 +232,7 @@ static int process_data(const unsigned char *data)
 
 static void data_read(void)
 {
+#if BOOGER
     unsigned char ibuf[25];
     int32 rd_cnt, ofs;
 
@@ -262,6 +265,7 @@ static void data_read(void)
        }
     } while (GPS_Serial_Wait(fd));
     fatal(MYNAME ": Incomplete download\n");
+#endif
 }
 
 static arglist_t brauniger_iq_args[] = {

diff --git a/gpsbabel/filterdefs.h b/gpsbabel/filterdefs.h
index 029786bf893b94da85aec759c0d69d95dbabe10e..91cf930e5bf4f598c03d9767fcff243180ecc3ac 100644 (file)
--- a/gpsbabel/filterdefs.h
+++ b/gpsbabel/filterdefs.h
@@ -40,6 +40,7 @@ filter_vecs_t * find_filter_vec(char * const, char **);
 void free_filter_vec(filter_vecs_t *);
 void disp_filters(int version);
 void disp_filter( const char *vecname );
+void disp_filer_vec( const char *vecname );
 void disp_filter_vecs(void);
 void exit_filter_vecs(void);
 

diff --git a/gpsbabel/jeeps/gpslibusb.c b/gpsbabel/jeeps/gpslibusb.c
index 0adbf77edc8dcbde2def133e5ccd949ba5a3ed3a..879d2b7c307a554258f5496a5be2355d19d9623f 100644 (file)
--- a/gpsbabel/jeeps/gpslibusb.c
+++ b/gpsbabel/jeeps/gpslibusb.c
@@ -99,7 +99,7 @@ gusb_libusb_get_bulk(garmin_usb_packet *ibuf, size_t sz)
 
 
 static int
-gusb_teardown(const char *pname)
+gusb_teardown(gpsdevh *dh)
 {
        if (udev) {
                usb_release_interface(udev, 0);

diff --git a/gpsbabel/jeeps/gpsusbwin.c b/gpsbabel/jeeps/gpsusbwin.c
index c4c984e149ca8b83df7cec7bf2a0fb8f949b218f..174e4ffdfbd619f9ac416c4fcb04752c4f2a238d 100644 (file)
--- a/gpsbabel/jeeps/gpsusbwin.c
+++ b/gpsbabel/jeeps/gpsusbwin.c
@@ -56,8 +56,8 @@ typedef struct {
 static HANDLE *usb_handle = INVALID_HANDLE_VALUE;
 static int usb_tx_packet_size ;
 
-int 
-gusb_win_close(const char *portname)
+static int 
+gusb_win_close(gpsdevh *handle)
 {
        if (usb_handle != INVALID_HANDLE_VALUE) {
                CloseHandle(usb_handle);
@@ -252,7 +252,7 @@ gusb_init(const char *pname, gpsdevh **dh)
                }
                /* We've matched.  Now start the specific unit. */
                garmin_usb_start(hdevinfo, &devinterface);
-               gusb_close("blah");
+               gusb_close(NULL);
        }
        gusb_list_units();
        exit (0);

diff --git a/gpsbabel/tpo.c b/gpsbabel/tpo.c
index 5017ca8b37604721da1e822ba53662788b90ad75..c4f96e7d8d18765dcbd453e347bba625a77c4351 100644 (file)
--- a/gpsbabel/tpo.c
+++ b/gpsbabel/tpo.c
@@ -489,7 +489,6 @@ int tpo_read_32()
 //
 int tpo_read_int()
 {
-    unsigned char buff[4];
     int val = 0;     // Init to zero to clear higher bytes
 
 
@@ -531,7 +530,6 @@ int tpo_read_int()
 //
 int tpo_find_block(unsigned int block_desired)
 {
-       char buff[4];
     int block_type;
     int block_offset;
 
@@ -570,7 +568,6 @@ int tpo_find_block(unsigned int block_desired)
 waypoint *tpo_convert_ll(int lat, int lon) {
     double latitude;
     double longitude;
-    double height;
     waypoint *waypoint_temp;
 
 
@@ -961,7 +958,7 @@ void tpo_process_map_notes(void)
         char *waypoint_name;
         waypoint* waypoint_temp;
         unsigned int num_bytes;
-        int jj;
+        unsigned int jj;
 
  
 //UNKNOWN DATA LENGTH
@@ -1160,7 +1157,6 @@ void tpo_process_text_labels(void)
         int lon;
         unsigned int name_length;
         char *waypoint_name;
-        char *comment;
         waypoint* waypoint_temp;
 
  

diff --git a/gpsbabel/trackfilter.c b/gpsbabel/trackfilter.c
index 27505cc26391746cd21a88e2a0ae084cefaeaa00..ef4bf3c8946e71c77ee5108d79092a62b45d8122 100644 (file)
--- a/gpsbabel/trackfilter.c
+++ b/gpsbabel/trackfilter.c
@@ -203,6 +203,7 @@ trackfilter_parse_fix()
                return fix_none;
        }
        fatal( MYNAME ": invalid fix type\n" );
+       return 0;
 }
 
 static void